Merge "Add Flag for connected display recording" into main