Merge "Reduce blank widget headers" into jb-ub-mail