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

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