am 00c85656: am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev

* commit '00c8565614d3555e723ff3d8dad3af92d69d81ea':
  Don't allow windows with invalid types to be added.