Merge "Fix issues where the task was still touchable in overview" into sc-v2-dev am: a7fedd96

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15689743

Change-Id: I1bd9865a449ae0dc7ac6baab7d0dc5712d05b160