Merge "GWPC: wait for displayId to be set before calling listeners" into main