Merge "Add explicit userId to AppWidget binder calls"