Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev