Merge "Update Settings Storage app icon" into ics-mr0