Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev