Merge "[Bouncer] Force bouncer into portrait mode." into tm-dev