Merge "Add ThumbnailObserver" into 24D1-dev