Merge "Add performance test of add/remove window"