Merge "Update settings for app hibernation" into sc-dev