Merge "Add local service interface for app hibernation"