Merge "Notifications: Fix janky group expansion animation" into oc-dev