Merge "optimize p2p scan time in finding auto GO" into sc-dev