Merge "Don't add StageChangeRecord when stage task moves to back" into main