NXP-15457 Audit ES only override PageProvider (not the CV)