Merge "Skip migrate server invalid state if resize is off"