Merge "Don't use main handler in ImageWallpaperTest" into rvc-dev