Merge "Adjust animation end callback for SystemUI" into main