Merge "Add MediaFormat key for slow-motion marker info"