Merge "Properly update cc/bcc visibility in finishSetup" into ub-mail-master