rebase cleanupAppWidgetIds()

Change-Id: I22a50b10dccae2b63544882fbecd09332e08a0ca