Merge "Make BigPictureIconManagerTest resilient to diverse screen factors" into main