Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev