Merge "Fix usage of HWC_DISPLAY_PRIMARY in vr flinger"