Updated phone state handling in city demo