Merge "Add @UnsupportedAppUsage to the old inline APIs for compatibility" into rvc-dev