Merge "Use the correct lock to protect members in PolicyControl"