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