BUG 1029666 Windows pervent autologin from reaching 0 r=dustin
Merge default -> production