Merge "Removed temporary workaround for multi-window assist crash."