Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev