am 4b27125d: Merge changes Ib28636e6,I93ebc433

* commit '4b27125d8881924f003dfc70f46b21ab5d57f2a8':
  WallpaperManagerService does not properly propagate setDimensionHints()
  ImageWallpaper : get bitmap width before calc screen offset