Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev