Merge "Revert "Update the bouncer to be able to move to either side of a wide screen."" into sc-dev