Merge "Fixing revert/confirm resize tests"