Merge "Fixes quickstep swipe up animation being stuck"