Merge "Fix black screen when drag divider to bottom" into sc-v2-dev am: 4fb674ff67 am: b921eb1203

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

Change-Id: I76b601a7f82836717d9d1ab686b15f71e69d4291