Merge "Unhibernate when an app is no longer force-stopped." into sc-dev