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 am: 37bda3f2

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

Change-Id: I41fbcdb161df95f17d5b888d58b0bf0de8aae360