Merge "Fixed an issue where notifications wouldn't animate on height change" into sc-dev