Merge "Log lock time if it takes too long" into main