Merge "Add metrics constants / enums for removal dialog"