Merge "Trace callbacks for user switcher" into main