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

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

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

Change-Id: Ib407c165c708bff5b3ade5b0460570cc97c46545