Merge "Disable instead of hiding add account preference" into nyc-mr1-dev