am 585273e2: am a027e9c7: am 6551b7ef: Merge "Updating the widget tray" into ub-now-porkchop

* commit '585273e28f02c479f077367e0b9122996e2b1161':