Merge "Add more shutdown actions and a new NPU sensor type"