Merge "Add a reason arg to streamStateUpdated"