am 07ee3fda: (-s ours) DO NOT MERGE. Already in master. Fix #1977876 : Key preview in WVGA broken.

Merge commit '07ee3fdaea879fb568ab3263102766b46130ce56'

* commit '07ee3fdaea879fb568ab3263102766b46130ce56':
  DO NOT MERGE. Already in master. Fix #1977876 : Key preview in WVGA broken.