Merge "avoid device recovery in background device actions"