Merge "Pager Controller stops listening on account changes" into jb-ub-mail