Merge "Fix space counting for justified text"