Merge change 23817 into eclair

* changes:
  Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)