Merge changes I414b9a5f,I0a08b06b

* changes:
  Fixed a bug where the notifications could get stuck animating
  Better messaging style wrapping