Merge "Remove conflict window crop" into tm-dev