Merge "SideBySide2: Fix nowrap CSS rule in header"