Merge "Implement resolving of icon attributes to resIds in AlertController"