Merge "Remove userId parameter from exported image URL before sharing" into main