* commit 'a317b4b560cfa9955b1a0f3d902f67b47df52678': Revert "Change display Strings to CharSequence (1/2)"