Merge "Fixed a bug with the scrollability of notifications" into nyc-mr1-dev