Merge "Add a loading text when waiting for wifitracker results"