Merge "Fix robolectric test failure in settings"