Adjustments from SlimRoms (2/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: I4ce0bd94bb312508f02557f6df13050d65a156af