Merge "Fix early access to cacheUserSerialNumber API" into main