Merge "Fix media removal issue when media is updated" into main