Merge "Fix widget update issue"