Merge "media: add SyncSettings to MediaSync and MediaPlayer"