Merge "Add external physical display emulation"