Merge "Update animation timing for split dismiss animation" into main