Merge "Reduce unnecessary callbacks in AppOpsService." into main