Merge "Fix lastDispatchedState sources change" into main