Merge "Reset preview only after transition completed (2/2)" into main