Merge "Update documentation of MediaHandler"