Merge "Allow veiled address pattern to be updated through settings" into jb-ub-mail-ur8