Merge "Update type hints in TraditionalImageGallery"