Merge "analytics: avoid account_type switch on notification creation" into jb-ub-mail-ur10