Merge pull request #6107 from hackbar/cleanup Android UI: lots of cleanups, mainly around how Fragments are handled
