Correctly detect Android tablets in the `Environment` class (see #5869)