Merge "Refactor isAppHibernationEnabled check in AppHibernationService" into sc-dev