Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev