Merge "Add support for secondary display with display ID"