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: c99c492b am: fa088889

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

Change-Id: I2c0b07484e102f9d0fde96aa711669bdab70de41