Merge "Bug fixes for new search ui w/ Dialpad." am: f09b9f8f65 am: df94395766
am: 828e877622

Change-Id: I867f278f0b7abb7b2ad3accbcf10233010aabe75