Merge "Add null check for AccessibilityButtonController.isAccessibilityButtonAvailable"