Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev