Merge "Code refactoring, prep for contacts/calendar." into jb-ub-mail-ur10