Merge "Decoder: Fix undefined left shift"