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

Change-Id: I8714be5933827c015f1446d5231f5c1f704b53c3