Merge "Adding avatar picker to platform allow list" into main