Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle"