Reapply "fix(app): startup efficiency (#18854)"

This reverts commit a379eb38673aad097e1f178307865ec40a5ac3ea.