Merge "mm-core: Add kKeySmoothStreaming"