Merge "Fix NPE on non decodable Bitmap" into klp-dev