Merge "Change SharedPreference keys for feature discovery promo" into ub-contactsdialer-h-dev