Merge "Remove SystemProperty gating-flag for virtual displays." into oc-dev