Merge "Only cancel pending resize transition if it still exists" into main