Merge pull request #6087 from hackbar/cleanup3 Android: UI cleanup, including combining Save/LoadStateFragment into one
