Merge "hwc2: Avoid flush on command mode with secure display"