Merge "Refactoring: deduplicate surface bounds calculation."