Merge "Update decodeImage to account for alignment"