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

Change-Id: Ifbda0a75a79e644763e83baf86a7823310a56f5b