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 am: 55099981 am: 0067a5d9

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

Change-Id: Id4a5a5b069a487ddb288191d2774236f56b197ce