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

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

Change-Id: If4a4e8398330719665a3afa2d5267c660538f337