Merge "Give the tests the ability to emulate other devices screens" into tm-dev