CB-2666: Re-ordered the update of subviews