Merge "Skip lockdown setup if user is not up yet" into nyc-dev