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

* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
  Make default windows features configurable.