Merge "Don't show data disabled icon when user isn't setup" into nyc-dev