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

Change-Id: I74f40e19035a1c27f0120d93af23e64a296fbf15