Merge "Fixing LauncherAppCompoent not available for isolated context" into main