Merge "sdm: Avoid flush for command mode panels"