Merge "ClientModeImpl: Always move to DisconnectedState on suppl state change" into sc-dev