Merge "Add a test for reverting a resize with a deleted flavor"