Merge "Convert more loadIcon() to IconDrawableFactory"