Merge "Notifications: Fix janky group expansion animation" into oc-dev am: add77afe43
am: f6f58c02b2  -s ours

Change-Id: I8e41f0bfe909438580a2f186e27ffb82e9f92cb7