Merge "Retrieve thumbnail for freeform windowing" into main