Merge "Don't wait for ThemeOverlayController during boot." into main