Merge "Handle csip set member automatic pair in Setting"