Merge "Dialog to record other displays" into main