Merge "More minor refactoring in SpannableStringBuilder"