Merge "set connection state after adding NonSimulatorConnectionListener and set connection to active at the end."