Merge "Speculative fix for swipe to refresh text height" into jb-ub-mail-ur9