Merge "Hide unneccessary streams after config changes"