Merge "Cancel veil animations on dispose" into main