masonry: Update according to its upstream

Mostly for Outlayer bugfixes