Merge change 8444

* changes:
  Fix #1977876 : Key preview in WVGA broken.