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

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