Merge "Preserve wallpaper visible state for a while when display switches" into main