Merge "Make Settings robotest work with tot Robolectric"