Merge "Fix vulnerability by explicitly set the class name of avatar picker." into main