Merge "Always assign leftover pixels to last weighted child" into nyc-dev