Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev