Merge "Ensure user storage is prepared after mount"