Merge "Notify onFinished when activity is destroyed." into sc-dev