Merge "Cleanup RecyclerViewCacheTest GapWorker access"