Merge "Make sure that if we display the loading view, it stays for 2 seconds" into ub-mail-master