Merge changes from topics "RefactorDevControllers", "MoveDevOptionPrefCtrl"

* changes:
  Refactor AdbPreferenceController
  Move DevOptionsPrefCtrl to SettingsLib