Merge "TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input" into lmp-dev