Merge "Fixed an issue where the footerview and others would fly over the...

Merge "Fixed an issue where the footerview and others would fly over the screen" into sc-dev am: 6e76e995

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

Change-Id: I52d4213429db65b7ba750019470a5486362ca80f