Merge "Call preference.setEnabled only after updating disabledByAdmin state." into nyc-dev