Merge "msm: sde: avoid re-configuration during inline validate"