Merge "Some doc fixes to MediaHandler. No code changes"