Merge "vrwm: Add support for multiple independent displays"