Merge "Register AppHibernationManager in service registry"