Merge "IpConfigStoreTest: increase timeout for waitForIdle"