Merge "Replace drag & drop constants with finalize ids"