Merge "Handle uiMode change in CompatUI" into udc-dev