Merge "In WindowManager code, wrap Binder.restoreCallingIdentity() in finally{}."