Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
am: 301fc823f3

Change-Id: Ib28ae2a7b3614fa73fa4e1b08e5607f7d6011891