Merge "Ensure bouncer in correct position on swipe. Remove orientationlistener." into sc-dev