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

Change-Id: I70b18aebd8ba5eb0cb8bac5c8bfdb4ca460885e1