Merge "Fix NetworkController no longer tracking userSetup" into sc-v2-dev