Merge "Fix handling of constraints for unspecified height RelativeLayouts"