am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs"...
am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973e
automerge: 485f6a60
* commit '485f6a60':
Fix crash caused by disabling the Options panel on TVs