Merge pull request #485 from jdlayman/video-fixes

components/ItemGrid/ItemGrid.brs

@@ -325,8 +325,8 @@ sub showTVGuide()
     if m.tvGuide = invalid
         m.tvGuide = createObject("roSGNode", "Schedule")
         m.top.signalBeacon("EPGLaunchInitiate") ' Required Roku Performance monitoring
+        m.tvGuide.observeField("watchChannel", "onChannelSelected")
     end if
-    m.tvGuide.observeField("watchChannel", "onChannelSelected")
     m.tvGuide.filter = m.options.filter
     m.top.appendChild(m.tvGuide)
     m.tvGuide.lastFocus.setFocus(true)

components/liveTv/schedule.brs

@@ -30,6 +30,7 @@ end sub
 
 sub channelFilterSet()
     print "Channel Filter set"
+    m.scheduleGrid.jumpToChannel = 0
     if m.top.filter <> invalid and m.LoadChannelsTask.filter <> m.top.filter
         if m.LoadChannelsTask.state = "run" then m.LoadChannelsTask.control = "stop"