Merge "Fix broken logging of loader add/remove" into jb-ub-mail