Merge "Support external display rendering in vr flinger" into pi-dev