Merge "Refactor AccessibilityControlTimeoutPreferenceFragment to improve maintainability"