Merge "Recalculate max notifications on lockscreen" into main