Merge "Increase timeout for ui tests" into nyc-dev