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