Merge "Increase volume search timeout, fix dialog flow." into pi-dev am: 2e3aacaa7a
am: 3595870fa8

Change-Id: I6d5a007bc61c4e136f75c0462df4967e1861a92d