Merge "Add a delay before walled garden test" into ics-mr0