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

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

Change-Id: I19258376976332ac994d7a6ba18ad90e6cf4b6e7