Merge changes I05d567d6,I031d0a9f into main

* changes:
  Add ShadeDisplayAware to classes left out
  Make StatusBarTouchShadeDisplayPolicy the default one