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