Merge "Fix possible deadlock in AddAccessFlags and ClearAccessFlags"