Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev