Merge "Revert "Fix for Swipe to Dismiss Animation"" into main