Regression: Fix echo overlay for Echo in beta

Also broken by UserProfile refactor

Change-Id: I68b6b0fc779afd83b53bcd5fa2b6dc90086b3148
Merge "Regression: Fix echo overlay for Echo in beta"