Merge changes I01abbef2,Ib1070f30 into main

* changes:
  Introduce ShadeDisplayPolicy
  Enable WindowContext to move to another display