Merge "Support secondary displays"