Merge changes I3a966bc7,I91e6832d

* changes:
  Adjust window layout for DisplayCutout
  Display Cutout: Add emulation