Turn of forcelayout flag, make various actions clear the sync resolution dialog