Merge changes from topic "settings_presubmit_instr_test"

* changes:
  Refactor help menu stuff into a controller
  Fix UniquePreferenceTest