Merge changes I478047cc,Ibe16ffd7 into pi-dev

* changes:
  DisplayCutout: Ensure stable insets cover top cutout
  Cutout: Use stable density for inflating simulated cutouts