am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev

* commit '7c08dd61c43d76241c8f47c5aae934486605a80e':
  DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier