Merge cm11, allow reboot-recovery to show default in powermenu