Merge "New black drawables for tap and pay" into lmp-dev