am 45fee32b: am b2af6076: Merge "Ensuring that widget ids are cleaned up" into jb-ub-now-jetsonic

* commit '45fee32bc3d25ed021f58a9bf76863f617cef65e':
  Ensuring that widget ids are cleaned up