Merge "Sync disabled tip" into jb-ub-mail-ur10