Merge "Fix minimized state messup" into nyc-dev