Change the lock phase to have smth more consistent

Remove WaitForMultipleVirtualLocks and wait for locks before each build and
validate phases.