Merge pull request #20674 from nullaus/bug1021857

bug 1021857 - Ensure z-index for AttentionScreen makes it top-most.
(cherry picked from commit f2b7236f28d528cd2a12691fba004e1a2afa929d)
Merge pull request #20782 from nullaus/v2.0

Merge pull request #20674 from nullaus/bug1021857