Fix clearfix, which triggered scrollbars

Change-Id: I6296757239e861c8af28fe9945d9ddd3b69bb945
Merge "Fix clearfix, which triggered scrollbars"