Merge "reworked the flow in the account chooser  - resilient to the chooser activity being killed due to memory pressure  - back now goes back to the main chooser screen rather than canceling    it completely" into ics-mr0