Revert "PLF-5158 : NullPointerException when click Abort button after edit layout of portal"

This reverts commit 8204419f4fd88897cf0c292061fdd578c6a4d0e7.