Merge "2/2 Making bouncer shift on double tap when user chooser is visible" into tm-qpr-dev