Merge "Launcher tweaks." into ics-factoryrom