Merge "A few new launcher assets" into ics-factoryrom