Merge changes from topic 'two_target_preference'

* changes:
  Update string character limit
  Convert BT preference to use TwoTargetPreference
  Refactor the layout for MasterSwitch to a 2 target pref