Merge "Add null check on ActionBar in AccessibilitySettingsActivity"