Merge "Update enforcement for wallpaper scaling to post B" into main