Adjustments from SlimRoms (1/2)
- Those changes come from new power menu from SlimRoms but the power menu isn't ported. So i cherry-pick only the necessary.

Change-Id: I8ee1f8766d9e4d78546f74bf355b24a322ec1ac3