Merge "Update default app icon" into ics-mr0