Merge "Set active stream when progerss changed by user"