Merge "Defer more Account actions until user starting." into jb-mr1-dev