Package refactoring and persisted "Keep Screen On" setting