Merge "Revert "[TVInputDevice] Register/unregister keys from mandatoryMap"" into...