Merge changes from topic "am-8a851e6a87254e3ab32d2dc3e493ba72"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Hide EmptyShadeView when on bouncer" into tm-qpr-dev am: 80b08509 -s ours am: 31e23bec -s ours am: 8224ff35 -s ours
  [automerger skipped] DO NOT MERGE Hide EmptyShadeView when on bouncer am: 2e640447 -s ours am: 3d23a669 -s ours am: 532765a3 -s ours
  [automerger skipped] Merge "DO NOT MERGE Adding tests for updated EmptyShadeView logic" into tm-qpr-dev am: ab7941d8 -s ours am: 095a0097 -s ours am: 05324c3b -s ours
  [automerger skipped] DO NOT MERGE Adding tests for updated EmptyShadeView logic am: e6fe1a0e -s ours am: bb6ec7f7 -s ours am: 912a3cec -s ours