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