Merge "Avoid NPE when drawable fails to load" into mnc-dev