Merge "Fixed an issue where notification dismissals wouldn't animate" into sc-dev