Merge "tablet visual tweaks. more caret." into jb-ub-mail-ur9