Merge "Harden /mnt/{user,installer} permission bits"