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

* commit '569ae3921d8945da9d48858771158e4f80232d9e':
  Ensuring that widget ids are cleaned up