Merge "Migrate to using DisplayLayout instead of DisplayInfo" into sc-dev