Merge "Resolve aconfig flag deps for Launcher" into main