Merge "Let AppHibernationManager be mockable" into sc-dev