Merge "Revert "Add logs to indicate why a surface is invalid"" into sc-dev