Merge "Improve grid preview performance" into rvc-d1-dev