Merge "Revert "Add support for render-ahead""