Merge "Fix an crash if you pass a SpannableString" into jb-dev