Merge "Clear the pending app freezer task if it's killed." into sc-dev