Merge "Upgrade cloud media thumbnail API"