Merge "Ensure preference icon is returned when inflated from XML even if it has not been displayed yet." into cw-f-dev

core/java/android/preference/Preference.java

@@ -719,6 +719,9 @@ public class Preference implements Comparable<Preference> {
      * @see #setIcon(Drawable)
      */
     public Drawable getIcon() {
+        if (mIcon == null && mIconResId != 0) {
+            mIcon = getContext().getDrawable(mIconResId);
+        }
         return mIcon;
     }