Merge "Set text in layout rather than programmatically" into ub-contactsdialer-h-dev am: c2eff7d994
am: b182f78219

Change-Id: Iaf3d0eddca2b32f8f64e9126f99b459f79d2bec6