Merge "[Bouncer] Fix MODERN BOUNCER issues." into tm-qpr-dev