Merge "Fix MirroringDialog specs" into main