Merge "[Bouncer] Fix flicker tests." into tm-qpr-dev