Incorporate CI improvements from the widget-customizer branch

Cherry picked:

aa8106923480d97a0dd4e52df75cf16ee0ad6ce0
948280ed73289e021fbb904a11a343455a777352
6b35ebe3b55d2382f800056de946a5cfa9af7f66
6ba38885f97e674074f48c9209594b159876d1e5