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