Updated picker UI for linking and send to labels. am: 85405d033a
am: e854d00643

Change-Id: I0a664779fc2f2c495bbf778f34a04f9498f59abf