Merge change 21598 into donut

* changes:
  Remove WQVGA skin from SDK