Merge "Do not allow bouncer translation when scrimmed" into pi-dev