Revert "Revert "Switch to new power button device name""

This reverts commit ebaa9801e6b1bd7039181b2ffecf2d2531d1e946.