am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev

* commit '445768bddf00256195a46b78ed35ea3722df7c92':
  Allow disabling the Options Pannel feature for TVs