Merge "MountService: Harden for pre-boot usage users"