Merge "SideBySide2: Restore selection after discarding a new comment"