Merge "Cleanup marking logic for non-moving objects"