am 4e61ad77: Merge "Cleanup widget config activity" into ics-mr0

* commit '4e61ad777a698ad7c67be6e4dcf7410b30b08e6f':
  Cleanup widget config activity