Merge "Update imagedecoder for header updates"