Merge "Rename AppOpsCollector -> OnOpNotedCallback" into rvc-dev