Merge "Synchronize on the right lock in AccessibilityController"