Merge "Freeing frame map"