Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev