Merge "Remove then add during replace to reset vis" into rvc-dev am: 155007ab am: 2302ed04

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

Change-Id: I4ae9d3e08a4086df9f4516f9ea5c7ebb6c98a24f