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

* commit '5337aea1536c11e5bfef49a14297fd4649baa3a3':
  Revert "Updating the widget tray"