Merge "Add a flag to fix the null pointer exception on Avatar Picker." into main