Merge "Remove unnecessary assert helpers from WindowTestBase"