Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev
am: 1d01f9cf67

Change-Id: I4072d3d1ccd258473ccc35412dd3b002e0239f2d