Merge "Performance optimizations for new insets" into rvc-dev