Merge "Workaround to avoid crash in user photo selection" into nyc-dev