Merge "Merge "Fixed issue with associating WindowToken with null binder." into oc-dev am: d193972a" into oc-dev-plus-aosp