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

* commit '91628f6cf3ddf282e27df4b8bb22ebb8c64bbc73':
  Fixed a bug with the number of notifications visible on lockscreen