am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature...
am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
automerge: 69fbcf1f
* commit '69fbcf1f':
Allow disabling the Options Pannel feature for TVs