Merge "Fix Notification animation controller memory leak" into main