Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev