Merge "Remove then add during replace to reset vis" into rvc-dev am: 155007ab1f am: 2302ed049f am: ea3676371c

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

Change-Id: Idd8850e197cebe1b09dfe7b03922fc4ac10e98bd