Merge "Dismiss promo when Back button is pressed (1/2)" into ub-contactsdialer-g-dev