Merge "Avoid reentrance on ClipArea APIs" into nyc-dev