Merge "Bouncer - Ensure one-handed mode bouncer side" into tm-dev