Revert "include screenoff power savings"

This reverts commit b05405740c6c8d35b4a8075d862e4c30cbca14a1.

Conflicts:

	cherry-picks.sh