Merge "SideBySide2: Set comment box minimum height to 16px"