Merge "Cleanup widget config activity" into ics-mr0