Merge "[Bouncer] destroy and recreate view when..." into tm-qpr-dev