Merge "Set user icon to default when updating profile without photo" into nyc-dev