Merge "Waiting for idle in test"