Take badges out of experimental mode

This does not enable badges yet because it needs a config change, too.

Change-Id: Ib996197d7d49e68f478f8b7fee260a2b2a12ee9a
Merge "Take badges out of experimental mode"