Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev am: daa0d214dd
am: 832dd49a1f
* commit '832dd49a1f35ab8be9be34e0756a67da56e1d828':
Change-Id: Ibe9c352de6578199a14968126fcfef64937298a0
This commit is contained in: