Merge "Fix issue where back button causes shade to appear over bouncer." into tm-qpr-dev