Merge change 5483 into donut

* changes:
  Expand support for different screen sizes.