Merge "Fixing some issues with AppsCustomize" into ics-mr0