Merge "Fix AccessibilityEventLogger"