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

* commit 'bfd3bda9acf6d13849e61f601d907fdef0b12df3':
  Ensuring that widget ids are cleaned up