am 296ea917: am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev

* commit '296ea9174222e64085a66a238e6df13b8b378b1e':
  Make default windows features configurable.