Merge "Fixing LauncherIcons leaking outside sandbox context" into main