Merge "Fixed the motion when expanding notification groups" into nyc-dev