Merge TiVo improvements to stage focus and keyboard events