automerge: 69fbcf1 * commit '69fbcf1f100905f5a28909d561db4753189bd717': Allow disabling the Options Pannel feature for TVs