Merge "Remove references to FEATURE_PC and related Desktop classes in Launcher" into main