Merge "Let touch screen and joystick could be associated with the display"