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

* commit '485f6a60e0182767d57a5ab08d6438124a69439e':
  Fix crash caused by disabling the Options panel on TVs