Merge "Return the existing display ids when registering a display window listener" into sc-v2-dev