Revert "DO NOT MERGE -- Revert the following two commits as they're causing flickering"

This reverts commit 44bd57ee25484bd74025c116f8a83d1df5990f34.

bug: 30831873
bug: 30790402
3 files changed