Merge "Add some logging to aid debugging device state transitions." into sc-v2-dev