Merge "Hide Vr2dDisplayFlag annotation"