Merge "Fix race condition that skips corner updates on half swipe"