Merge "sdm: Add a property to disable scalar"