Merge "Refactor virtual view tests in preparation for compat mode submit mode support."