Merge "Correct displayId info in log when WMS#addWindow returned ADD_INVALID_DISPLAY"