Merge "Lock more of the things" into qt-dev