Merge "Make sure to update last frames after handling moving and resizing" into main