Changes for android
Lots of additions, removals, and starting on configuration dialog