Merge "Fix incomplete update of Provider<CurrentUser> in ChangeJson"