Merge "Updated Settings Launcher icon Bug: 5286988" into ics-factoryrom