Merge "SideBySide2: Fix transfer of focus into comment box"