Merge "Use Selector instead of Ripple on pre-L" into ub-contactsdialer-b-dev