Merge "Add missing 'public' keywords to some MediaHandler methods"