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