Merge pull request #2088 from mourner/master

Fix data flash when panning, close #2082