Merge "rework big text to handle gmail use case" into jb-dev