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

* commit 'c3c336766abee6bb780b5f9022fda7db720b5372':