Revert "Tidy up reboot menu"

This reverts commit 768fa33b8362d5ff8815fd6fd72d5652810f7249.
Proximity : Check proximity flags only if from native

Change-Id: Id1be619e638de6a45252d8390eab6e38bd5de5a7