Only show smiley face in beta

Kenan was concerned about a prominent UI change going straight
to stable, reverting to old icon in stable

Change-Id: I75a7fbf50f059581d73b1c8fa567a2f372e8e251
Merge "Only show smiley face in beta"