Android: Attempt at fixing the container selection issues after clear. Some container information persists after a clear() that shouldn't... this was an attempt at fixing that but, it didn't work... however I want to switch locations so commiting so I don't lose the work.