Merge "[Flexiglass] Fix Notification removal animations" into main