Merge "Replacement spans correctly measured in TextView"