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

* commit '3fd8a433a918fc9c57b6d7ff12839a1e028d6dad':
  Allow disabling the Options Pannel feature for TVs