Merge "Add getIconName to AppIcon" into tm-qpr-dev