Merge "Add an option to record secure windows" into main