Merge "Workaround for assist crash with multiwindow" into nyc-dev
am: 9fb0e97ecb

* commit '9fb0e97ecb732585d3c8855b459fd1f8e52f7d2b':
  Workaround for assist crash with multiwindow

Change-Id: Ia026329d903ed525990614f9b046bbed3579a96b