Merge "Revert "Add logs that indicate why a surface is invalid"" into rvc-dev