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