Merge "SideBySide2: Track SkipBar instances by the starting line"