am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper dimensions in bounds calculation" into honeycomb-mr1

* commit '3de6a9b692437d5ce14d672cad4eff4c7ed0ae23':
  Fix 4025684: Don't include wallpaper dimensions in bounds calculation