Merge "Fix issue with internal Active Source state tracking"