Merge "Revert linear layout weight distribution algorithm" into nyc-dev