am ed0cf41d: am 99bde108: Merge "Final refactoring of the user/profile...
am ed0cf41d: am 99bde108: Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
* commit 'ed0cf41d':
Final refactoring of the user/profile settings screen.