Merge "Correctly handle negative margins in horizontal linear layouts."