Merge "Fix AddWidgetTest flake Test: ABTD" into tm-qpr-dev