am 9fb2695c: am 628025fd: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev

* commit '9fb2695c3ed806a4dee755e730b50935c7bb10f6':
  Defer more Account actions until user starting.