Merge "Use string resources for avatar picker button labels." into tm-dev