Merge "Refactor PatchTable and PatchScreen to use PatchValidator"