Merge "Notify listeners after restoring last used source"