am 6c66e984: Merge "New UI for account picker" into jb-dev

* commit '6c66e9842e93874bfd6d8c3dbcd19e7dae379877':
  New UI for account picker