Merge "More sync status messages" into jb-ub-mail-ur10