Merge "Restore UnsupportedAppUsage method call" into rvc-dev