Merge "Don't collapse the shade when SHOW_BOUNCER" into tm-qpr-dev