Merge "Revert "Temporarily increase timeout for devices with buggy driver"" into nyc-dev