Merge branch 'fbdev/panning-fixes'