Merge "Merge "Remove then add during replace to reset vis" into rvc-dev am: 155007ab1f am: 5306229d9b" into rvc-d1-dev-plus-aosp