OZP-17: fix merge issues, bug fixes

- fix bug where locked and layoutconfig would be changed even on cancel