Merge "Fix some keyframes devel api crash issue" into devel/master