Merge "Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency."