Port forward: Alternate Default App Picker / Reboot Dialog

Alternate Default App Picker
--Zaphod <mwilson@acesappraisal.com>

Reboot Dialog and subsequent fixes
--Roman <romanbirg@gmail.com>

Port to work on 4.2, apparently Google thinks it's funny to
move the ShutdownThread every rev...

Change-Id: I4ab31e6767079c3bb6a9cba0a15b36e3627e9aef
partial revert of 72d0d217384d671dcc7d810506036d4f6cf06f46