Merge "Explicitly require empty list when the device is idle"