Merge "Continuation of the unified account chooser flow." into ics-factoryrom