Revert hooks to how they looked in vivid
This fixes https://github.com/ubports/ubuntu-touch/issues/667 and https://github.com/ubports/ubuntu-touch/issues/665 and https://github.com/ubports/ubuntu-touch/issues/582
And might even have positive effect on https://github.com/ubports/ubuntu-touch/issues/611 and https://github.com/ubports/ubuntu-touch/issues/514
This will need testing on a handful of different devices, since it's a critical part.