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