Widgets: update to the new demo app + fixes

(Cherry picked from:
575c2f592ee3e36a680e61d0b7bf2106e42bfbca
7fe275e97075cc8f9590df43134cb304014c0dfb
6ed80ffa3ec81eec1ef866c3c89f3d7542edbacb
1b328ad588e4e595bb4470f8eb7eee098e00fb26
)