Merge "Fix attempt for testAddAndDeletePageAndFling" into main