Merge "[Sb] requestLayout when visibility state changes" into main