Merge "ImageDecoder: throw FileNotFoundException on null"