Merge "Fixes for resize thread" into nyc-dev