Merge "Fix transition for forced resizable exit" into nyc-dev