Revert "Revert "CM11 Themes: Delay setting default theme""

This reverts commit b5f57c8fffde0d50d205f989dbf575abf750aa8e.