Merge "Mocked device should be consistently external or internal" into main