Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev