Merge "Use callback of remote display change as timeout token" into main