Merge "SideBySide2: Move diff preferences popup 90px left"