Merge "sdm: disable iwe virtual display creation before doing flush"