Merge "HSP: Correctly hang up call when key is pressed" into pi-dev