Merge "Do not let negative margins reduce the size of the LinearLayout."