Merge changes I32e604ad,I8d56f641 into main

* changes:
  Use ShadeDisplayAware window manager to add the Shade view at first
  Move shade layout params to dagger