Merge "Extract Mirror windowcontrol to a single class"