Merge "Fix ItemsProviderTest#testGetItems_sortOrder" into sc-mainline-prod