Merge "Fix unified comment editing with single click on line numbers"