Merge "Don't use main handler in ImageWallpaperTest" into rvc-dev am: 6d2586f0 am: fcf65435 am: 0b591a58 Change-Id: I0a5fe3a2a05660e8caf6819bfe101bd935a6cf28