Merge change 9039 into donut

* changes:
  Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA