Merge "Add isElegantHeight to Layoutlib"