Merge changes from topic "revert_ui_mode_changes" into rvc-qpr-dev

* changes:
  DO NOT MERGE Revert "Handle uiMode changes"
  DO NOT MERGE Revert "Defer recreation until resumed"