Merge "Delay gargabe collection during onDestroy()" into sc-dev