Merge "Remove locking when dispatching to app op policy" into sc-dev