Merge "Remove hidden onAvailable callback override" into sc-dev