Merge "Enabling Fallback launcher cases" into main