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