Merge "sdm : Refactor display code to support single system image"