Merge "Added error handling to settings suggestions list" into nyc-mr1-dev