Merge "[pm] improve the performance of recomputeComponentVisibility" into main