Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev