Removed exclusive edit mode

Change-Id: I7c4c8985e14a31c48e0b47cda4a506efdbdaa96c
Merge "Removed exclusive edit mode"