Merge changes I2bf9f964,Ic0524c97 into main

* changes:
  Send WallpaperToken visibility to SyncTransaction
  Set up show/hide in startT/finishT for wallpapers