Merge "DO NOT MERGE Hide EmptyShadeView when on bouncer" into tm-qpr-dev