Merge "Turning wait_for_unlock on by default."