Revert "Fix issue with inconsistent stage visibility"

This reverts commit b5ad495d.

Reason for revert: b/383444878

Flag: EXEMPT revert
Bug: 383444878
Test: atest WMShellUnitTests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5982319fc7ad653f467c99854eb09b39a12ea9d6)
Merged-In: If62db174c6552e986d5c16061c70ba6f7611dc0c
Change-Id: If62db174c6552e986d5c16061c70ba6f7611dc0c