Merge "Don't wait for the MountService to be ready when encrypting"