Merge "Use a shorter wait time for p2p connect with operating frequency" into sc-dev