Merge "[PB] Preventing wallpaper become empty after merge transition." into main