Merge "Add KeyFrames APIs" into devel/master