Merge "Revert "Fix bug #15001610 Java crash in settings is observed while adding Google account on wiped device""