Merge "Fix cancel handling in account settings screens" into ub-mail-master