Merge "Bouncer shouldn't be translated when occluded" into pi-dev