Merge "Fix flying notification on lockscreen after fold" into main