Merge "one more step towards multiple display support"