Merge "[mtectrl] resolve race with reboot"