Merge "Fix multi-user silent notifications on lockscreen" into main