Merge "Fix HibernationSettingStateLiveData NPE" into sc-mainline-prod