Merge "Support Keyframe definition for AVD on RT"