Merge "Disallow EJs that time out from running in Doze or battery saver." into sc-dev