Merge "Remove a duplicate device state check"