Merge "Add multi-display support"