Merge "Add displayId to DPC logs" into sc-dev