Merge "Fix bug where shade is infinitely squishy after wallpaper change" into sc-v2-dev am: 16e1d510 am: 33cc8b0a

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

Change-Id: I7e0208fba1888bd9b20661813d85eb2f8bd7ce15