Merge "[Test Week] Move ViewCacheTest.kt to multivalentTests folder" into main