Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev
am: 00e61f5a
* commit '00e61f5a':
Fixed a bug where text would still not animate
Reseting user expansions when the shade is collapsed
Added more spacing around notifications
Fixed an bug with the notification backgrounds