Lock order inversions in main

There are a number of lock order inversions in !3997 (merged) that are applicable to main.

Extract them into a seperate MR so they can be applied to all applicable branches.