Merge "Rename MANUAL_DND to MANUAL_DND_ACTIVE in TestModeBuilder" into main