Only add a new picker dialog if there isn't one already am: 91e8d84db9
am: 2b5b36817d

Change-Id: Id235a26c85c5fea126c01820ed4e7a55dc6d3840