Merge "Null out launcher reference to prevent leak" into main