Merge "Remove incorrect optimization in visibility cache" into rvc-dev