Bug 1054229 - Follow-up of bug 1024298: Remove unused numberLayout from layout loader