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

* commit '24f642634719f106c95a9cc19a7b80c0ad4d6c68':