DO NOT MERGE Revert "Handle uiMode changes"

Bug: 171707437
Test: Repro steps on bug

This reverts commit 0ad7b172e67294d76e4fc8785336badb9d0a8344.

Change-Id: If30cbb6c155e879dc8307a0a4a06dfb548b389a1
(cherry picked from commit 4b4341d3a7df63796f09c9162a5678a865686134)
4 files changed