Merge change 20877 into donut

* changes:
  Add internal support for screen size/ratio, and version qualifiers.