Merge "[DO NOT MERGE] Don't show account access request UI until app launched." into nyc-mr1-dev am: 32ce3c8797
am: 81f0e66a13

Change-Id: I724d580c4a3eb2caea7b6c9f79a1f35de66df846