Merge "Rename onFreeCacheRequested API" into sc-dev