Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
automerge: 1f81973

* commit '1f81973e7d33f2a3f4b0a0e232854283f0f18030':
  Fix crash caused by disabling the Options panel on TVs