Merge "Fix crash opening avatar picker in non-en-US locale." into udc-dev