Merge "Add traces for remote display change" into main