Merge "Fixed the animation of the no notifications view" into nyc-mr1-dev
am: a9663254ac

Change-Id: Ic46c44d89aed0d1b9e80f91cf83b2d43dcbbdfd8