Merge "Skip router rescheduling test"