Merge "Refactor WindowTestsBase to use one-task depth activities"