Merge "Added support for wake-up by displayId" into main