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