Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev