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

* commit 'a06b41b06e5bbcf5bf02741a765ebad5367c14de':
  Avoid NPE when drawable fails to load