Merge "Run mtectrl later in boot sequence" into main