Merge "Change display Strings to CharSequence (1/3)" into lmp-dev