Merge "Account for HiDPI variants in thumb.php rate limiting"