Merge "Remove dispatchKeyEventToHdmi()"