Merge "Fix overlap between lock and notif shelf" into main