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