Merge changes from topics "RefactorDevControllers", "MoveDevOptionPrefCtrl"

* changes:
  Use DeveloperOptionsPreferenceController
  Move DevOptionsPrefController to SettingsLib