Rework and drop unused code from EditEntityAction

Change-Id: Iea535aeb6be88311ff66eca149967f11fde1be35
Merge "Rework and drop unused code from EditEntityAction"