am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev

* commit '58156b4123acf92f2a03885136a3b6859801f000':
  Fix NPE when restarting ChooseTypeAndAccountActiivty.