Merge "Avoid showing bouncer when in a launch transition" into pi-dev
am: a102591e13

Change-Id: I0f3e3be4e7bbd931f8b2ae122276c707f20c153b