Merge "Fix e2e tests after Angular updates." into main