Merge "Notify combined account when individual accounts change" into jb-ub-mail-ur10