Merge "Unflag ignoring APEX packages in UPS (i.e. in V+)" into main