Merge "Fix NotificationPanel animation jank."