Merge "Add missing display ID" into sc-dev