Merge "[Bouncer] Fix some responsiveness issues." into tm-qpr-dev