am 6a4db337: Merge "Fix NPE on non decodable Bitmap" into klp-dev

* commit '6a4db337c716d739c55b0c154eb16770a4b917e4':
  Fix NPE on non decodable Bitmap