Merge "Tweaks to NotificationPanel animation"