Merge "Track changes during transitions and report to player"