Merge "Fix some things with overflow, persistence, & visibility" into rvc-dev...

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

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

Change-Id: I9d67499711acd8bfd55f2617cb750d55bb1538fe