Merge "DO NOT MERGE Revert "Handle uiMode changes""