Merge "SpannableStringBuilder correctly manages MARK and POINTS" into jb-dev