Merge change 20235

* changes:
  Fix layout for high dpi display.