Merge "Support tighter rate limiting for "non-standard" thumbnails"