Merge "Revert "Fix thread contention issues in messages and pan gestures."" into...