Merge "Release virtual display hwcId during vr mode transition." into oc-dev