Merge pull request #13161 from nelljerram/felix-live-migration-timer-stale-pop