Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev