Merge commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db' * commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db': Delay resetting mPreventDrag flags so that the Plugin
Merge commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db' * commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db': Delay resetting mPreventDrag flags so that the Plugin