Merge "Icon updates: location, settings, cdma roaming" into klp-dev