Merge "sdm: Query strategy if there is a need to validate" into display.lnx.5.1