Merge "Fix activity has leaked ServiceConnection errors" into pi-car-dev