Merge "Fix 3-button showing up briefly on the AllSet page in setup" into 24D1-dev