Merge "DngCreator: Avoid moving absent tag entries"