[automerger] Merge "Avoid showing bouncer when in a launch transition" into pi-dev am: a102591e13 am: 39f8dee83f

Change-Id: Ie39a5dc0b09501102c2a9e99bb70b0ea9faee1fd