Merge changes Id4b24284,I32514c70 into main

* changes:
  Exclude unnecessary window early in DisplayWindowsObserver
  Update window info by attributes in an earlier stage