Merge "Merge "Crop wallpaper windows to their current target stack bounds" into nyc-dev am: bc5446cba5 am: e706e6cc82" into nyc-mr1-dev-plus-aosp