Merge "Added turn on/off virtual display"