Merge "Disable screen off animation in situations where it currently looks bad." into sc-dev