Merge "MODE_SHOW_BOUNCER - Make sure bouncer shows" into tm-qpr-dev