Merge "Introduce AdbPreferenceController"