Merge "Re-enable appwidget test" into klp-modular-dev