Merge "Remove extra scheduleTraversalLocked"