am 4cfc7a91: am 77c1376c: Merge "Updating the widget tray" into ub-now-porkchop

* commit '4cfc7a91485fd80297c33e03e094c51bca4c1280':