Tidy up reboot menu

Change-Id: I63b09b03ca9a0ca7a6d37b320f855781befb9dae
Merge remote-tracking branch 'slim/kk4.4-caf' into ose