Merge "Fix some things with overflow, persistence, & visibility" into rvc-dev am: afbfb25d

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

Change-Id: Ic9387524932d62d043415f1f6626de2d20d4fdfd