Merge "Fix for Swipe to Dismiss Animation" into main