Merge "Addresses issue where sometimes we don't get onContentReady call" into jb-ub-mail