Merge "Roll back delete/undo feature to dialog style"