Merge "Defer recomputeComponentVisibility." into rvc-dev