Merge "sdm: Avoid flush for Command mode panels"