Merge "Include Add Network button for Setup Wizard" into jb-dev