Merge "Limit notifications on lockscreen to a maximum 4." into master-lockscreen-dev