Merge "Add DisplayId to DesiredActiveModeChanged trace"