Merge "Prepare user storage when a private volume has been mounted." into rvc-dev