Add flag to set the layout-id after applying the updates