Merge "Adopted Storage: Prepare user storage before move" into main