Merge "Default face lockout should be duration==0"