Merge "Add support to record external displays"