Merge "Fix flickering when layers resize in-place" into nyc-dev