Merge "Revert "Destroy and reinflate bouncer before showing"" into tm-qpr-dev