Fix back button events... backtokill is still funky

Change-Id: Iacecc6c8e9e6ad4f3891b3b8ee2795037f72edc3
Forward port wifi fixes from jb42

Change-Id: I5b6c368a326f8418fb18b26da2845969d4b46013