Merge "Widget asset cleanup" into honeycomb