Merge "Don't return true for controlling screen off once we've already returned false for this sleep." into sc-dev