Merge changes I223fdd44,I8345e6e5 into main

* changes:
  Use desktop task's custom density for its window decor
  Add flag to match header density with the desktop windows'