am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev

* commit '597bb6968be56c1b8b0629ba89fec409084cc112':
  Add a config for whether to start in touch mode.