Merge "Fixed a bug with the number of notifications visible on lockscreen" into nyc-dev