Merge "Revert "Device renderer functional tests intermediate rate""