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

Change-Id: If026407618907cbbb6ccd456e5fb9fcea5c13826