Merge "Fix bitfield bug with vertex shader selection"