Merge "Disable Add user until Setup prompt is shown" into nyc-dev