Merge "Do not invalidate stream when the secondary outputs are changed." into sc-dev