Merge "Fixed issue with associating WindowToken with null binder." into oc-dev