Merge "Fixed a bug where not enough notifications were shown on lockscreen"