Merge "Do not apply mtectrl state on shutdown if it hadn't been loaded" into main