Merge "Don't report device state until hardware state is known." into sc-dev