Merge "Never interact with "phone" while holding locks." into pi-dev