Merge "Use hasSystemFeature(String) overload for RoSystemFeatures fallback" into main