Merge changes If58d648d,Iec51a349

* changes:
  Add persistence for app hibernation states
  Move AppHibernationServices dependencies to injector