Merge "display: Use common includes in SDM" into display.lnx.3.0-dev