Merge "SideBySide2: Do not refocus draft box on redraw"