Merge "Increase volume search timeout, fix dialog flow." into pi-dev