Merge "Fix lock contention in AppOpsService" into sc-dev