Merge "sdm: Add single system image support" into display.lnx.5.0