Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev