Merge "Add handleActiveSource() to update atom local active source."