Merge "Fix an issue is SF that caused drawing artifacts when hwc changed mode"