Merge "Exclude translation caused by surface insets from the matrix" into rvc-dev