Merge "Update use mediadrmserver config property name"