Merge "Fix imm5 and shift_type detection"