Merge "Account types at toplevel of Settings" into jb-dev