Merge "New UI for account picker" into jb-dev