Fix regression caused by #14147 patch (#14147)

The previous patch caused TestCurrentPageFirstItem to fail.

Change-Id: I6eec8818f5ba2ce847a696afa40ba423ec482668