Merge "Make sure moveToNext/moveToPrevious handle edge cases in CC" into jb-ub-mail