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: 544da9f4

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

Change-Id: Ia979033b313f99c47d1537d61d47c46db5a6bc91