am b6f40305: am 24f64263: am 5337aea1: Merge "Revert "Updating the widget tray"" into ub-now-porkchop

* commit 'b6f40305a524512fcc1dac175ba57f7c41655fd8':