NXP-11419: follow PageProviderService API changes
Merge branch 'master' into 5.6.0
Revert "NXP-11419: follow PageProviderService API changes"

This reverts commit e7062f3c4553ba038418fc228fa2524f3c1f5402.