Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev