Merge "DeviceIdle ignores charging state if no battery."