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

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