Merge "Fix NPE when mPolicy is unset" into ub-mail-master